Solving ignore conflicts