resolved conflict.