merge messed up, trying a shortcut