Removed Conflict Mark in lotto.html