updating deploy
done home page and user search
mergin conflicts