rebuild
merge
remove stray console.logs