initial commit
added idea files
resolved conflicts