Fixing merge conflict

Signed-off-by: Brittany Owens <baowens@wpi.edu>