fix touch issue with merge