Install guide
Fix merge conflict