merging changes from hagar
deleting unnacesary files