Testing git merge
merge conflict resolved