Giving me a staged change after the merge. Going to commit it to see
what happens.