removed merge comments
removed console logs