Resolving merge conflicts from networkingFundamentals