code cleanup
fixed conflict