Fix scene conflicts