the branch merging fiasco i just went through removed this line