conflict lookupper. error correction when pushing single event moves at the beginning or end boundary
Merge remote-tracking branch 'origin/master'