fix merge conflicts left in code.. argh