Restored working state.
Cleaning up ...
Updating makefile ...
Cleaning up the makefile.
Finished work on the ASF example for now ...
Merge finished.