add line code on master for live site
resolve merge confilct