Fixed conflicts on the host.