Merging in buggered git thanks to Dropbox AGAIN