Fix merge conflict

Fix merge conflict