Merge problems
Updated server IP