commit prior to merge to master