Resolve merge conflict

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>