Just finished buiding a much more user-friendly post system for wasteof.mobile, then realized that I hadn't pulled the changes from the repository. Now I have a mess of a merge conflict