it's those final hours
fixed merge conflicts