Edited FXML files
resolved merge conflict