Merged Conflicts

I'm not sure whether what I did is correct or not