Fixed the merge problem

Fixed the merge problem.