merging from the laptop
Resolved the conflict