I thought merges were fixed. my bad