new patterns
merge conflicts