Fixed foreign keys, generated erd, resolved merge conflicts ;D