fixing merge
help