test if .idea folder still pushed?
Merge remote-tracking branch 'origin/master'