commit code
after merge working