merge latest changing