Fix branch conflicts