Progres and sketching all over
Resolving merge conflicts