Fixing merge conflict issue