Testing merging files

Signed-off-by: fad4470 <fad4470@rit.edu>