moved choose_path to choose file
fixed merge