fix forward conflicts