Fix merge error
Increased touch sensitivity