solved conflicts && level loading