Commit before pull.
Resolve merge conflict in bootstrap extensions.