Fixed PR Conflicts