enhancement of process handling
resolved conflicts