Resolve conflics