Fix the conflicts