fixed up loginviewcontroller
fix merge conflict