resolved FK conflicts