dimer minimization and energy calculations
merge conflicts