i forgot how to do the merge lel