Hmm something happened to Git

This should feex all conflicts