Git workshop sample for 04-conflict-resolution
