Fix some merging issues