More merging

how do I git