working on auto merge conflict
removing the swp file