patch following merge problems