resolve merge conflict

Signed-off-by: Thad Allender <thadallender@gmail.com>