I don't understand how to properly merge
I don't understand how to properly merge