I've set the XML indentation the same way as the rest of the modules using 4 spaces instead of 2.
<<<<<<< HEAD
refs/heads/master