Extract tools with command line options
comflict merge