code cleanup
update merge conflict