botched conflicts in last commit