non-conflict merge