updated api for userwebite
resolved conflicts