touch conflict resolved ..