sort out slightly bad merge