zap merge conflict line