working application
resolve conflict and out of date java file