quick fix
Merge remote-tracking branch 'origin/master'
fixed touch issues
Merge remote-tracking branch 'origin/master'