recalculating...
?
fixing conflict