fix networking issues
fix conflicts