update gan
update merge