jamestalmage fix bad merge