Fixed wrong merge.