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

This reverts commit 0683bece9a4e08359a168c01ee2ae0effcf33409.