deleting extra files
finishing merge