Fixed some merging issues