remove merge detritus

I selected GPL 3