We also manage our collections in git, but merging is horrendous. Have you found any good workarounds for this? For example, often you don't know a collection has changed, because Postman doesn't reload it from disk automatically...