resolove conflict