gi commit lang nako kay conflict ... change the name data proxy1 to connecticut