hopefully fixed paperclip bug
merge conflict fixed