merge after conflict