Added bridge table for child and parent
fix conflicts