commit prior to going back to try and merge balraj's branch