commiting for merge conflict issue