Implemented sparse MNA matrix
Fixed Conflicts