test merge vs commit