behaviour added with changes
conflict solve