Before the merge
The merge