Fixed some merging stuff