Merge from remote.
Merge conflicts