Fixed funky merge issues.