Resolve conflits