added auto simple merge