Change long click to just a click
Merge remote-tracking branch 'origin/master'