git

I solved the merge conflict by accepting both sides. The code now greets the user twice and bills them once. Or twice.