Everything is working as it was before that terrible merge conflict.