fixed some errors with the merge