Solved the conflicts