floggit

How can I improve at this merge?

How can I improve at this merge?