fixing some syntax problems from merging