fixed gestures glitch in authoring mode, fixed merge errors