Revert "Merge Conflict Resolution?"

Reverts ZomgPonies/Paradise#476