Testing random environment on windows
Fix merging
Add some patterns, fix windows merge