it looks like at least github doesn't see that this file was moved, and we changed stuff in that, so that will give a complex merge.