Dont commit conflicts