installed paperclip
paperclip installed
fixed merge conflicts