fixing moar conflicts and what not