Fixed errors caused by auto merge that did not work correctly