Better Git merging