Fixed merge conflicts, deleted add answer button

We dun fucked up, but then we fixed it!