first commit in new local dir
attempt at merge