v1.0.8
Fixing of conflicts