fixing errors that happened during merging