Fixes the merge error from dev.