Don't commit your merge conflicts ffs!