add feature rsi
solve conflict
loosen condition