updated fix file
remove fix-file from fix
Merge branches 'fix' and 'master'