init home commit
merge conflicts