Commiting just in case the diff is not all whitespace
Resolve merge conflicts.