fix avatar in search
fix merge