Fixed undefined conflicts