Minor fixes
Fix merge conflict