mh part
resolve conflicts