removed merge conflict issue