before merge
fix merge conflict
fix search bar