Hybrid merge conflicts fix