merge with conflicts example partly done