rest api on going
conflict resolved
added api