Finish stroke
Fix conflict