conflicts resolved again