reolving merge conflict