small changes
Fix merge conflict