touch detetion succeeds
Merge conflict resolved