Updated with comments about merge vs rebase