Improve gesture conflict resolve