[BUGFIX] Changed IPs to 172 and fixed issues that arose from merge conflict resolution