minor code beautification
fix merge conflict