I do not like conflict when I merge