commiting a number of bug fixes
sorted out the merge conflicts in the places