Resolve merge conflict with dictionary reorder