fixes cause of merge