Fix big merging issues