Removed errors introduced by failed git merge.