jordan change local should conflict with repo
revert