store password on local storage
fix conflicts