fixing branch conflicts