Fix some weird merging issues