fixing merge conflict error