Looked at files.
merging conflicts.
Changed branches. This is annoying.
Up to date with Mr.W