new ip for connection
conflicted files