Staging a conflict.
whoops I forgot how to resolve merge conflicts
Resolve the conflict.