fixed incomplete merges from pull request