Work on application code.
fix conflicts.