fixed syntax caused during merge