Very interesting problem to work on. I feel the pain of merge conflicts especially with large codebases. Applied through your careers page