Loginview and merge conflict.