Merge
merge
vrolent removal of paperclip from app