idea specific file must be independent of github sources
Merge remote-tracking branch 'origin/master'