fix merge con
Merge pull request #7 from autumnfjeld/inhouselogin

fix merge con