code cleanup
fixed merge conflict