when finished with further development of two branches of the original code base, you wish to bring both code segments into the coherent single branch again. what command should you use to do this?