resole merge problem