Resolve merge conflicts and fix Moving functionalities