Try to solve the  merge conflict