fixed merge conflict
fixed merge conflict

colincam/Awesome-Appliance-Repair,lnxchk/Awesome-Appliance-Repair,lnxchk/Awesome-Appliance-Repair,lnxchk/Awesome-Appliance-Repair,colincam/Awesome-Appliance-Repair