fixing merge

fixed