fix bad merge (noob)