Fixed ".", "*" and "..".
Fixed git conflict.