Added context menu for extracting
Fixed merge conflicts