reslove conflict.