user module corrections
conflict resolved