fixed n-n interaction diagonal in m
Merge conflict.