fixed syntax error
fixed merged changes
fixed merging issues