fix unsolved conflics from last merge