attempt at merge