fixing merge

maybe