resolved merging conflict

fixed git merge conflict