Fixed weird errors caused by Github conflicts.