merged two conflict version