Fix merge problem

Fix merge problem