delete idea config in SCM
Merge remote-tracking branch 'origin/master' into newmaster