Conflict solved for Fix Sunsystem