Handling minor merge conflicts with analysis doc