other info on Jupiter
resolved conflicts