Reslove conflict.