Can build bag-of-words for each image
Fix merge conflict