[MERGE] removing a file that shouldnt be there