Working on resolving conflicts with Live site, Staging site, and Local site