fixing initial conflicts...