surviving a massive commit without merge errors

coding memes and programming memes and humor for programmers and developers