README merge fail