prereq add
merge conflict