Clean up merge.
Some merge issues were cleaned up.