Another conflicts resolved