merge: fix merging issues