working version hopefully with all commit overwrites fixed