Strategy impl
Strategy impl, resolved conflicts