GJP-29: Removed merge conflict information.