fix some merging messups