Dealing with dumb merges, joe i'll put your work back in a minute