idr
conflicts are resolved
conflicts are resolved
adding rows and columns is added