join modification of the same line
resolve the conflict of joint editing of same line