Removing this file that resulted from a merge conflict.