Removed accidentally committed merge file