Bit more docblock typehinty goodness
Fixed conflict.