Validation first phase
fixing conflicts