fixed some merging errors