removed stupid merge comments