removed some of merge comments