Pull changes from remote into local project
List the remote names
git remote
Get updates from listed remote repository
git pull -s subtree <remoteName> master --squash
Probably things need to be merged manually. This can be done in IntelliJ IDEAS