just created a new repo
mergetool again
talked with bryant