remove accidental merge file for release