rating a bit
Fixed merge issues.