changed login location
merge error