hhhdhdhhdh
from trail commit
from trail inserted on sop
solved mergconflict
commiting conflict resolved