commit prior to merge with master