Neglected to hit save before committing previous merge conflict.