adds mapping to search for conflict markers added by git