About and Tutorial done
Resolving merge conflicts