Fixed some of the merging issues