moidif in body
fixing conflict in body
modif in simulnet
modif
save and simulnet
fixing conflict