fixed some errors caused by accepting conflicts