ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames