merge master and fixed } error