Fixed conflicts and errors.