I still can't merge properly, I guess