Removed stray conflict line in 1.7.2 release notes.