improve if condition whether installed or not
fix conflicted