fixing strategies
fixed merge