imal merged conflict 1