correct comit (bad merge)