Remove an additional return statement resulting from a merge conflict.