Paperclip Changes and Conflicts Fixed
Fixed Conflicts