fix bug 101
git is free software
a -> the
merge