- Fixed some merging issues