added a file in RC-1 which should result in a merge conflict