fix merge issues
minor whitespace and color fixes