readme.txt  conflict-marker-size=30