Corrected some merging issues