merged external changes