A pesky lingering merge conflict!