conflict merge code