removed avatar folder
fixed search roomate nav bar merge error