merging conflict is solved