commit before branch cleanup.
Fixed merge conflicts.