Fixed merge conflicts, deleted add answer button