[390] fix merge conflict