merge seed conflict
add associations
fix sort