Small changes
Fix merge conflict