fixing merge conflicts

Signed-off-by: unknown <rug4133@IGMGRAD-07.main.ad.rit.edu>