modification stackoverflow
resolution conflits