Catch up with local changes (home)
Resolve merge conflicts