Updated basics.md to better show how merging works