removing swap file'
adding stuff
merging changes