Resolve Conflictions