Fixed merge bug

Fixed merge bug that its produced when I merged with master branch