improve line transitions
add brush
time to merge