needs model exists'
removed swap files
removed swap files
fixed merge conflicts