Resolving conflicts

Please try not to edit these files while I'm working on #33