fix scene conflict