This isn't right. Somehow you're trying to overwrite all of the changes to transitions that I made, so if you know how to just take this file out of the pull request, you should do that because none of these changes should go through