messed up an argument when merging conflicts