A brief history of GNU/Linux slide update
merge resolution