Work on application.
fix conflicts.