fixed home
merge conflicts