Resolve .>> vs 3257 ... 3257 conflicts.