fixed some merging issues