Continued fix of merge conflicts