not working live update code
fixing merge conflicts