prior to merging
ready to merge