second try to merge