Working on unbreaking the merge