My fiftieth post, welcome back my robot friend and merge conflict hell

This week finds me feeling tired but satisfied - the migration I've been working on this week and last is going as well as can be expected and I'm feeling fairly optimistic about it. With that being s