fixes some errors with merge conflicts