fixed allocateMatrices()
fixed conflicts