two finger touch
touch refresh
fix conflicts again