Checking in MergeProject.java with changes from PersonB