whampson Fix merge conflict