Merge branch 'master' of C:\Users\Myrian\Projects\WolkeFrio with conflicts.
Merge remote-tracking branch 'origin/master'