fix#2
style fix
merge conflicts