Before merging
Merging