matrices getting closer
fixed conflicts