Unresolved conflict.