Before merge
After merge