Revert "Merge Conflict Resolution?"
Merge pull request #477 from ZomgPonies/revert-476-master

Revert "Merge Conflict Resolution?"