Add profile link
Fix merge conf.