avoid branch conflicts