Fix of automate merge