Fix merge conflict issue