fixing conflicts
fixing conflicts
Merged
Fixed compilation errors, writing simulation output for validation log