fix merge branches
removing files