Remove buggy code comment
fix merge conflict
Final Strategy
Final Strategy Description