Ignore git resolution conflicts