update minor conflicts resolved