Add mappings to navigate conflict markers.