Delete file accidentally kept in merge