Ping-pong merging!

Hmmm. I might have to expand my knowledge of Git!!!