deleting unedded file
done merging