added paperclip
fixed conflicts, added paperclip