checking merge conflict