Fixing merge conflict like a boss