strategy
uploading strategy conflicts solved
minor conflicts