Added touches
Fixed merge