fixing broken build - resolved all conflicts