Removed merge comments