Some conflicts resolving.