minor fix to process
fixed conflict