Fixed merge and cleaned up.