minor
three-way merging requirement