Staged changes to resolve merge conflicts with latest git messes.