fixed some merging mistakes