Fixing master after incorrectly resolving merge conflicts