merging conflict
merge conflict
conflict fix
multipe fixes and paperclip refresh