Fix merging problem.
Fix merge problem