provoking merge conflict for science