berfore merge
after merge