removed bugs
removed conflicts
pull request