Name: Juan Antonio Martinez FSUID: jam14j I merged without using the --no-ff flag. Please refer to the reflog.txt file. It will serve as proof of my branched developement.