Some conflicts resolved