Merger of changes with florence