Made changes to lines in file

Testing how merge works