added files from HP
resolved the conflicts in file .gitignore while pulling