Can't sync git repo with rasa X 0.35.0

I think this is a YAML type error (not a story conflict).

Are you using the response selector? I think you may be running into the issue discussed here.