Added openFileDialog
resolved some problems and added openFileDialog
resolved conflict