try and fix bad merge