merge conflict the second