fix new record for address
fix conflicts