release lines upon end of gesture
Merge remote-tracking branch 'upstream/master'
resolve merge conflicts
Merge remote-tracking branch 'origin/master'
resolve merge conflicts