Removal of errors initiated during merge conflicts
Code review #1