Fixed minor merging error.