fixed all relationships! motherfucka!
fixing merge conflict
cleaning up