removed git merge issue