resolve odd conflict error