fixed additional merge issues and put ip into string