andy's merge conflicts