fix %
merge changes