upto now code is completed demo is working
conflicts are solved