Solve conflicts on save