removing file which accidentally got added during some merge?