Fix Merge conflict issue