resolving reconstruct conflicts
modifying