changes from git_hub
changes from git_hub; fixed a conflict