remove conflic results and resave