Added %
Fixed merge conflict