remove logging
update merge message