error: The following untracked working tree files would be overwritten by merge:
        assets/uploads/mailbox_9_large8.jpg
        assets/uploads/mailbox_9_large9.jpg
        assets/uploads/thumbnails/mailbox_9_large8.jpg
        assets/uploads/thumbnails/mailbox_9_large9.jpg
Please move or remove them before you can merge.