fixing merge gone wrong. #n00b